From: Eric Anholt Date: Mon, 9 Nov 2009 22:57:34 +0000 (-0800) Subject: drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON. X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~18380^2~101^2~16 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=21099537dbacc5c8999d833e6bfd1b72edd89189;p=linux-4.9.git drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON. Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 7bfded5e90bb..281faca3e37c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1405,7 +1405,9 @@ static int i915_load_modeset_init(struct drm_device *dev, return 0; destroy_ringbuffer: + mutex_lock(&dev->struct_mutex); i915_gem_cleanup_ringbuffer(dev); + mutex_unlock(&dev->struct_mutex); out: return ret; }